auto merge of #562 : alexcrichton/cargo/win64, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 11 Sep 2014 20:28:53 +0000 (20:28 +0000)
committerbors <bors@rust-lang.org>
Thu, 11 Sep 2014 20:28:53 +0000 (20:28 +0000)

Trivial merge